From cb0dbc560fbc48dac861ee119624500af4f54830 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Tue, 30 Sep 2014 19:46:10 +0000 Subject: [PATCH] Fixes for f90g from Jim Keeler. Should be good to go now! --- gpsbabel/f90g_track.cc | 6 +- gpsbabel/reference/track/f90g-sample.gpx | 1196 +++++++++++----------- gpsbabel/testo.d/f90g.test | 2 +- 3 files changed, 602 insertions(+), 602 deletions(-) diff --git a/gpsbabel/f90g_track.cc b/gpsbabel/f90g_track.cc index e858e057a..d7a314788 100644 --- a/gpsbabel/f90g_track.cc +++ b/gpsbabel/f90g_track.cc @@ -108,7 +108,7 @@ f90g_track_read(void) // Pick the TT record apart and if it is good, fill in a new Waypoint year = mon = mday = hour = min = sec = latitudeDeg = latitudeMin = longitudeDeg = longitudeMin = velocity= 0; // Get the time stamp - sscanf(ttRec,"%4d%2d%2d%2d%2d%2d" ,&year, &mon, &mday, &hour, &min, &sec); + sscanf(&ttRec[15],"%4d%2d%2d%2d%2d%2d" ,&year, &mon, &mday, &hour, &min, &sec); // Get latitude and longitude sscanf(&ttRec[30],"%1c%2d%6d%1c%3d%6d", &northSouth, &latitudeDeg, &latitudeMin, &eastWest, &longitudeDeg, &longitudeMin); @@ -121,7 +121,7 @@ f90g_track_read(void) // create the Waypoint and fill it in readWaypoint = new Waypoint; - dt = QDateTime(QDate(year, mon, mday), QTime(hour, min, sec)); + dt = QDateTime(QDate(year, mon, mday), QTime(hour, min, sec), Qt::UTC); readWaypoint->SetCreationTime(dt); readWaypoint->latitude = (double(latitudeDeg) + double(latitudeMin)/MIN_PER_DEGREE) @@ -131,7 +131,7 @@ f90g_track_read(void) // qDebug() << dt.toString() << latitudeDeg << latitudeMin << readWaypoint->latitude; readWaypoint->speed = float(velocity) * SPEED_CONVERSION; // Name the Waypoint - snprintf(tempBuf, sizeof(tempBuf), "T%2.2d%2.2d-%3.3dKPH", min, sec, velocity); + snprintf(tempBuf, sizeof(tempBuf), "%2.2dM%2.2dS-%3.3dKPH", min, sec, velocity); readWaypoint->shortname = QString(tempBuf); // Add the Waypoint to the current track diff --git a/gpsbabel/reference/track/f90g-sample.gpx b/gpsbabel/reference/track/f90g-sample.gpx index 1cdf9d1ee..408ca3366 100644 --- a/gpsbabel/reference/track/f90g-sample.gpx +++ b/gpsbabel/reference/track/f90g-sample.gpx @@ -6,1200 +6,1200 @@ ./reference/track/f90g-sample.map - - T3946-083KPH + + 39M52S-083KPH - - T3947-082KPH + + 39M53S-082KPH - - T3948-080KPH + + 39M54S-080KPH - - T3949-080KPH + + 39M55S-080KPH - - T3950-080KPH + + 39M56S-080KPH - - T3951-082KPH + + 39M57S-082KPH - - T3952-082KPH + + 39M58S-082KPH - - T3953-082KPH + + 39M59S-082KPH - - T3954-082KPH + + 40M00S-082KPH - - T3954-080KPH + + 40M01S-080KPH - - T3956-080KPH + + 40M02S-080KPH - - T3956-080KPH + + 40M03S-080KPH - - T3958-082KPH + + 40M04S-082KPH - - T3959-082KPH + + 40M05S-082KPH - - T4000-082KPH + + 40M06S-082KPH - - T4001-080KPH + + 40M07S-080KPH - - T4002-082KPH + + 40M08S-082KPH - - T4002-082KPH + + 40M09S-082KPH - - T4004-082KPH + + 40M10S-082KPH - - T4005-083KPH + + 40M11S-083KPH - - T4005-082KPH + + 40M12S-082KPH - - T4006-082KPH + + 40M13S-082KPH - - T4007-080KPH + + 40M14S-080KPH - - T4008-080KPH + + 40M15S-080KPH - - T4009-082KPH + + 40M16S-082KPH - - T4010-082KPH + + 40M17S-082KPH - - T4012-080KPH + + 40M18S-080KPH - - T4013-082KPH + + 40M19S-082KPH - - T4015-082KPH + + 40M20S-082KPH - - T4015-082KPH + + 40M21S-082KPH - - T4016-082KPH + + 40M22S-082KPH - - T4017-082KPH + + 40M23S-082KPH - - T4017-082KPH + + 40M24S-082KPH - - T4018-080KPH + + 40M25S-080KPH - - T4019-080KPH + + 40M26S-080KPH - - T4020-080KPH + + 40M27S-080KPH - - T4022-080KPH + + 40M28S-080KPH - - T4023-080KPH + + 40M29S-080KPH - - T4025-080KPH + + 40M30S-080KPH - - T4025-080KPH + + 40M31S-080KPH - - T4026-082KPH + + 40M32S-082KPH - - T4027-080KPH + + 40M33S-080KPH - - T4028-080KPH + + 40M34S-080KPH - - T4029-080KPH + + 40M35S-080KPH - - T4030-080KPH + + 40M36S-080KPH - - T4031-080KPH + + 40M37S-080KPH - - T4032-080KPH + + 40M38S-080KPH - - T4033-080KPH + + 40M39S-080KPH - - T4034-080KPH + + 40M40S-080KPH - - T4035-080KPH + + 40M41S-080KPH - - T4036-080KPH + + 40M42S-080KPH - - T4037-080KPH + + 40M43S-080KPH - - T4038-080KPH + + 40M44S-080KPH - - T4038-080KPH + + 40M45S-080KPH - - T4039-078KPH + + 40M46S-078KPH - - T4040-080KPH + + 40M47S-080KPH - - T4041-080KPH + + 40M48S-080KPH - - T4042-080KPH + + 40M49S-080KPH - - T4045-080KPH + + 40M50S-080KPH - - T4045-080KPH + + 40M51S-080KPH - - T4046-080KPH + + 40M52S-080KPH - - T4047-080KPH + + 40M53S-080KPH - - T4048-080KPH + + 40M54S-080KPH - - T4049-080KPH + + 40M55S-080KPH - - T4050-080KPH + + 40M56S-080KPH - - T4051-080KPH + + 40M57S-080KPH - - T4052-080KPH + + 40M58S-080KPH - - T4053-080KPH + + 40M59S-080KPH - - T4055-080KPH + + 41M00S-080KPH - - T4055-080KPH + + 41M01S-080KPH - - T4056-080KPH + + 41M02S-080KPH - - T4056-080KPH + + 41M03S-080KPH - - T4057-080KPH + + 41M04S-080KPH - - T4058-080KPH + + 41M05S-080KPH - - T4059-080KPH + + 41M06S-080KPH - - T4100-080KPH + + 41M07S-080KPH - - T4102-080KPH + + 41M08S-080KPH - - T4103-080KPH + + 41M09S-080KPH - - T4104-080KPH + + 41M10S-080KPH - - T4106-080KPH + + 41M11S-080KPH - - T4106-080KPH + + 41M12S-080KPH - - T4107-080KPH + + 41M13S-080KPH - - T4108-080KPH + + 41M14S-080KPH - - T4109-080KPH + + 41M15S-080KPH - - T4110-080KPH + + 41M16S-080KPH - - T4110-080KPH + + 41M17S-080KPH - - T4111-080KPH + + 41M18S-080KPH - - T4112-080KPH + + 41M19S-080KPH - - T4113-080KPH + + 41M20S-080KPH - - T4115-080KPH + + 41M21S-080KPH - - T4116-080KPH + + 41M22S-080KPH - - T4117-080KPH + + 41M23S-080KPH - - T4118-080KPH + + 41M24S-080KPH - - T4119-080KPH + + 41M25S-080KPH - - T4120-080KPH + + 41M26S-080KPH - - T4121-080KPH + + 41M27S-080KPH - - T4122-080KPH + + 41M28S-080KPH - - T4123-080KPH + + 41M29S-080KPH - - T4124-080KPH + + 41M30S-080KPH - - T4125-080KPH + + 41M31S-080KPH - - T4126-080KPH + + 41M32S-080KPH - - T4127-082KPH + + 41M33S-082KPH - - T4127-080KPH + + 41M34S-080KPH - - T4129-080KPH + + 41M35S-080KPH - - T4130-080KPH + + 41M36S-080KPH - - T4131-080KPH + + 41M37S-080KPH - - T4132-080KPH + + 41M38S-080KPH - - T4133-080KPH + + 41M39S-080KPH - - T4134-080KPH + + 41M40S-080KPH - - T4135-082KPH + + 41M41S-082KPH - - T4136-080KPH + + 41M42S-080KPH - - T4136-080KPH + + 41M43S-080KPH - - T4137-080KPH + + 41M44S-080KPH - - T4138-082KPH + + 41M45S-082KPH - - T4139-082KPH + + 41M46S-082KPH - - T4141-080KPH + + 41M47S-080KPH - - T4142-080KPH + + 41M48S-080KPH - - T4143-080KPH + + 41M49S-080KPH - - T4144-080KPH + + 41M50S-080KPH - - T4146-080KPH + + 41M51S-080KPH - - T4146-080KPH + + 41M52S-080KPH - - T4147-080KPH + + 41M53S-080KPH - - T4148-080KPH + + 41M54S-080KPH - - T4149-080KPH + + 41M55S-080KPH - - T4150-080KPH + + 41M56S-080KPH - - T4151-080KPH + + 41M57S-080KPH - - T4152-080KPH + + 41M58S-080KPH - - T4153-082KPH + + 41M59S-082KPH - - T4153-080KPH + + 42M00S-080KPH - - T4156-080KPH + + 42M01S-080KPH - - T4156-080KPH + + 42M02S-080KPH - - T4157-080KPH + + 42M03S-080KPH - - T4158-080KPH + + 42M04S-080KPH - - T4159-080KPH + + 42M05S-080KPH - - T4200-080KPH + + 42M06S-080KPH - - T4201-080KPH + + 42M07S-080KPH - - T4202-080KPH + + 42M08S-080KPH - - T4203-080KPH + + 42M09S-080KPH - - T4203-080KPH + + 42M10S-080KPH - - T4204-080KPH + + 42M11S-080KPH - - T4206-080KPH + + 42M12S-080KPH - - T4207-080KPH + + 42M13S-080KPH - - T4208-080KPH + + 42M14S-080KPH - - T4209-080KPH + + 42M15S-080KPH - - T4210-080KPH + + 42M16S-080KPH - - T4211-080KPH + + 42M17S-080KPH - - T4212-080KPH + + 42M18S-080KPH - - T4212-080KPH + + 42M19S-080KPH - - T4213-080KPH + + 42M20S-080KPH - - T4214-080KPH + + 42M21S-080KPH - - T4216-080KPH + + 42M22S-080KPH - - T4217-080KPH + + 42M23S-080KPH - - T4218-080KPH + + 42M24S-080KPH - - T4219-080KPH + + 42M25S-080KPH - - T4220-080KPH + + 42M26S-080KPH - - T4221-080KPH + + 42M27S-080KPH - - T4222-080KPH + + 42M28S-080KPH - - T4223-080KPH + + 42M29S-080KPH - - T4223-080KPH + + 42M30S-080KPH - - T4224-080KPH + + 42M31S-080KPH - - T4226-080KPH + + 42M32S-080KPH - - T4227-080KPH + + 42M33S-080KPH - - T4228-080KPH + + 42M34S-080KPH - - T4229-080KPH + + 42M35S-080KPH - - T4230-080KPH + + 42M36S-080KPH - - T4231-080KPH + + 42M37S-080KPH - - T4232-080KPH + + 42M38S-080KPH - - T4233-080KPH + + 42M39S-080KPH - - T4234-080KPH + + 42M40S-080KPH - - T4235-080KPH + + 42M41S-080KPH - - T4236-080KPH + + 42M42S-080KPH - - T4237-082KPH + + 42M43S-082KPH - - T4237-080KPH + + 42M44S-080KPH - - T4238-078KPH + + 42M45S-078KPH - - T4240-080KPH + + 42M46S-080KPH - - T4241-080KPH + + 42M47S-080KPH - - T4242-080KPH + + 42M48S-080KPH - - T4243-080KPH + + 42M49S-080KPH - - T4244-078KPH + + 42M50S-078KPH - - T4245-080KPH + + 42M51S-080KPH - - T4247-080KPH + + 42M52S-080KPH - - T4247-080KPH + + 42M53S-080KPH - - T4248-080KPH + + 42M54S-080KPH - - T4249-080KPH + + 42M55S-080KPH - - T4250-080KPH + + 42M56S-080KPH - - T4250-080KPH + + 42M57S-080KPH - - T4251-080KPH + + 42M58S-080KPH - - T4252-080KPH + + 42M59S-080KPH - - T4254-080KPH + + 43M00S-080KPH - - T4254-080KPH + + 43M01S-080KPH - - T4257-080KPH + + 43M02S-080KPH - - T4257-080KPH + + 43M03S-080KPH - - T4258-080KPH + + 43M04S-080KPH - - T4259-080KPH + + 43M05S-080KPH - - T4300-080KPH + + 43M06S-080KPH - - T4301-080KPH + + 43M07S-080KPH - - T4302-080KPH + + 43M08S-080KPH - - T4303-080KPH + + 43M09S-080KPH - - T4304-080KPH + + 43M10S-080KPH - - T4305-080KPH + + 43M11S-080KPH - - T4307-080KPH + + 43M12S-080KPH - - T4307-080KPH + + 43M13S-080KPH - - T4308-082KPH + + 43M14S-082KPH - - T4308-080KPH + + 43M15S-080KPH - - T4309-080KPH + + 43M16S-080KPH - - T4310-080KPH + + 43M17S-080KPH - - T4311-080KPH + + 43M18S-080KPH - - T4313-080KPH + + 43M19S-080KPH - - T4314-080KPH + + 43M20S-080KPH - - T4315-080KPH + + 43M21S-080KPH - - T4316-080KPH + + 43M22S-080KPH - - T4317-080KPH + + 43M23S-080KPH - - T4318-080KPH + + 43M24S-080KPH - - T4319-080KPH + + 43M25S-080KPH - - T4320-080KPH + + 43M26S-080KPH - - T4321-078KPH + + 43M27S-078KPH - - T4322-080KPH + + 43M28S-080KPH - - T4323-080KPH + + 43M29S-080KPH - - T4324-080KPH + + 43M30S-080KPH - - T4325-080KPH + + 43M31S-080KPH - - T4326-080KPH + + 43M32S-080KPH - - T4327-078KPH + + 43M33S-078KPH - - T4327-080KPH + + 43M34S-080KPH - - T4328-078KPH + + 43M35S-078KPH - - T4330-078KPH + + 43M36S-078KPH - - T4331-078KPH + + 43M37S-078KPH - - T4332-080KPH + + 43M38S-080KPH - - T4333-080KPH + + 43M39S-080KPH - - T4334-080KPH + + 43M40S-080KPH - - T4335-080KPH + + 43M41S-080KPH - - T4336-078KPH + + 43M42S-078KPH - - T4337-078KPH + + 43M43S-078KPH - - T4337-078KPH + + 43M44S-078KPH - - T4339-078KPH + + 43M45S-078KPH - - T4340-078KPH + + 43M46S-078KPH - - T4341-076KPH + + 43M47S-076KPH - - T4342-076KPH + + 43M48S-076KPH - - T4343-076KPH + + 43M49S-076KPH - - T4344-074KPH + + 43M50S-074KPH - - T4345-074KPH + + 43M51S-074KPH - - T4346-074KPH + + 43M52S-074KPH - - T4347-074KPH + + 43M53S-074KPH - - T4348-074KPH + + 43M54S-074KPH - - T4348-074KPH + + 43M55S-074KPH - - T4350-076KPH + + 43M56S-076KPH - - T4351-076KPH + + 43M57S-076KPH - - T4352-076KPH + + 43M58S-076KPH - - T4353-078KPH + + 43M59S-078KPH - - T4354-076KPH + + 44M00S-076KPH - - T4354-076KPH + + 44M01S-076KPH - - T4355-076KPH + + 44M02S-076KPH - - T4357-074KPH + + 44M03S-074KPH - - T4357-076KPH + + 44M04S-076KPH - - T4358-076KPH + + 44M05S-076KPH - - T4359-076KPH + + 44M06S-076KPH - - T4401-074KPH + + 44M07S-074KPH - - T4402-074KPH + + 44M08S-074KPH - - T4403-074KPH + + 44M09S-074KPH - - T4404-074KPH + + 44M10S-074KPH - - T4405-076KPH + + 44M11S-076KPH - - T4406-076KPH + + 44M12S-076KPH - - T4409-076KPH + + 44M13S-076KPH - - T4409-074KPH + + 44M14S-074KPH - - T4409-074KPH + + 44M15S-074KPH - - T4410-074KPH + + 44M16S-074KPH - - T4411-074KPH + + 44M17S-074KPH - - T4412-073KPH + + 44M18S-073KPH - - T4413-074KPH + + 44M19S-074KPH - - T4414-074KPH + + 44M20S-074KPH - - T4415-074KPH + + 44M21S-074KPH - - T4416-074KPH + + 44M22S-074KPH - - T4418-074KPH + + 44M23S-074KPH - - T4418-074KPH + + 44M24S-074KPH - - T4419-074KPH + + 44M25S-074KPH - - T4419-074KPH + + 44M26S-074KPH - - T4421-074KPH + + 44M27S-074KPH - - T4422-073KPH + + 44M28S-073KPH - - T4423-074KPH + + 44M29S-074KPH - - T4424-073KPH + + 44M30S-073KPH - - T4425-073KPH + + 44M31S-073KPH - - T4426-073KPH + + 44M32S-073KPH - - T4428-073KPH + + 44M33S-073KPH - - T4428-073KPH + + 44M34S-073KPH - - T4429-073KPH + + 44M35S-073KPH - - T4429-073KPH + + 44M36S-073KPH - - T4430-073KPH + + 44M37S-073KPH - - T4431-073KPH + + 44M38S-073KPH - - T4432-073KPH + + 44M39S-073KPH - - T4433-073KPH + + 44M40S-073KPH - - T4435-073KPH + + 44M41S-073KPH - - T4436-073KPH + + 44M42S-073KPH - - T4437-073KPH + + 44M43S-073KPH - - T4438-073KPH + + 44M44S-073KPH - - T4439-073KPH + + 44M45S-073KPH - - T4439-073KPH + + 44M46S-073KPH - - T4441-073KPH + + 44M47S-073KPH - - T4442-073KPH + + 44M48S-073KPH - - T4443-073KPH + + 44M49S-073KPH - - T4444-073KPH + + 44M50S-073KPH diff --git a/gpsbabel/testo.d/f90g.test b/gpsbabel/testo.d/f90g.test index c7ff6e606..9c36bb983 100644 --- a/gpsbabel/testo.d/f90g.test +++ b/gpsbabel/testo.d/f90g.test @@ -1,4 +1,4 @@ # F90G Automobile DVR GPS logging rm -f ${TMPDIR}/f90g.gpx gpsbabel -i f90g -f ${REFERENCE}/track/f90g-sample.map -o gpx -F ${TMPDIR}/f90g.gpx -# compare ${REFERENCE}/track/f90g-sample.gpx ${TMPDIR}/f90g.gpx +compare ${REFERENCE}/track/f90g-sample.gpx ${TMPDIR}/f90g.gpx -- 2.30.2